Restore the Starlette upgrade lost in a merge - #19
Merged
Conversation
The Starlette/FastAPI upgrade landed on main and was then silently undone by the next merge: a feature branch cut before it, merged with a stale view of origin/main, resolved requirements.txt and app/main.py back to the older content without reporting a conflict. The changelog entries survived because they were reconstructed by hand at the time; the code did not, and the loss was invisible in a green test run because the new TemplateResponse signature works on both Starlette versions. Re-applies the original change unchanged: fastapi 0.140.0, an explicit starlette 1.3.1 pin, the render()/error_page() helpers, and the canonical-host regression test. Nothing here is new — see the original for the reasoning and the advisories it clears. Verified against main as it now stands, so the upgrade is exercised alongside the trusted-proxy and groups-claim changes rather than on its own.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What happened
#15 merged, and the next merge silently undid it.
A branch cut before #15 was merged with a stale view of
origin/mainandresolved
requirements.txtandapp/main.pyback to the older content —without reporting a conflict. The changelog entries survived only because they
were reconstructed by hand at the time. The code did not.
It was invisible in a green test run: the new
TemplateResponse(request, name, context)signature works on both Starlette versions, so the migrated callsites passed against the old pin. The tell was the version banner in the test
run —
starlette==0.41.3where1.3.1was expected.What this restores
Nothing new — #15 re-applied unchanged:
fastapi==0.140.0and an explicitstarlette==1.3.1pinrender()/error_page()helpers and theTemplateResponsemigrationSee #15 for the advisories and the reasoning.
Verification
Run against
mainas it now stands, so the upgrade is exercised togetherwith the trusted-proxy and groups-claim changes rather than on its own — that
combination had never been tested as one tree until now:
starlette==1.3.1/fastapi==0.140.0confirmed installed in the run.
this branch.
Authentik accepts it and hands off to its login flow.
Audit of the other four
Checked every changed file from #14, #16, #17 and #18 against
main— allpresent and intact. #15 was the only casualty.